merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 30 Aug 2012 12:07:42 +0000 (21:07 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 30 Aug 2012 12:07:42 +0000 (21:07 +0900)
commit7202f156920a255a52080072a8d314a3cbcb6633
tree81539b9a1edbd017b2f34c5c52e698c5b41f7adb
parent12d3d4b1b2104a925f5310fffe823fa4d1f81a74
parentafc8ecf4f1b5e203716a7d2de4e3c54054bd2309
merge trunk